From 81f77532b58c0601b81d823ecef11172ff9b968f Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Tue, 13 Apr 2010 08:37:16 +0100 Subject: [PATCH] sysctl: Remove sockets_per_node field from physinfo command. Signed-off-by: Nitin A Kamble --- tools/python/xen/lowlevel/xc/xc.c | 1 - tools/python/xen/xend/XendNode.py | 1 - xen/arch/x86/sysctl.c | 3 --- xen/include/public/sysctl.h | 1 - 4 files changed, 6 deletions(-) diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index 24220b0091..514e48e760 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -1179,7 +1179,6 @@ static PyObject *pyxc_physinfo(XcObject *self) "nr_nodes", pinfo.nr_nodes, "threads_per_core", pinfo.threads_per_core, "cores_per_socket", pinfo.cores_per_socket, - "sockets_per_node", pinfo.sockets_per_node, "nr_cpus", pinfo.nr_cpus, "total_memory", pages_to_kib(pinfo.total_pages), "free_memory", pages_to_kib(pinfo.free_pages), diff --git a/tools/python/xen/xend/XendNode.py b/tools/python/xen/xend/XendNode.py index 2348461cc0..713967e2d5 100644 --- a/tools/python/xen/xend/XendNode.py +++ b/tools/python/xen/xend/XendNode.py @@ -931,7 +931,6 @@ class XendNode: 'nr_nodes', 'cores_per_socket', 'threads_per_core', - 'sockets_per_node', 'cpu_mhz', 'hw_caps', 'virt_caps', diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c index 80b7af7baf..ed09bffeea 100644 --- a/xen/arch/x86/sysctl.c +++ b/xen/arch/x86/sysctl.c @@ -63,9 +63,6 @@ long arch_do_sysctl( pi->nr_nodes = num_online_nodes(); pi->max_node_id = last_node(node_online_map); pi->max_cpu_id = last_cpu(cpu_online_map); - pi->sockets_per_node = - pi->nr_cpus / - (pi->nr_nodes * pi->cores_per_socket * pi->threads_per_core); pi->total_pages = total_pages; pi->free_pages = avail_domheap_pages(); pi->scrub_pages = 0; diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index 7255644286..ab6897d1da 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -93,7 +93,6 @@ DEFINE_XEN_GUEST_HANDLE(xen_sysctl_tbuf_op_t); struct xen_sysctl_physinfo { uint32_t threads_per_core; uint32_t cores_per_socket; - uint32_t sockets_per_node; uint32_t nr_cpus, max_cpu_id; uint32_t nr_nodes, max_node_id; uint32_t cpu_khz; -- 2.30.2